summaryrefslogtreecommitdiff
blob: b84b8fbdf322e46a2ea8cb49f15f6ab9871e9413 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
diff -Naur hwinfo-8.38/Makefile hwinfo-8.38/Makefile
--- hwinfo-8.38/Makefile	2004-03-28 18:27:42.000000000 +0200
+++ hwinfo-8.38/Makefile	2004-06-25 14:56:17.982879000 +0200
@@ -8,7 +8,6 @@
 
 include Makefile.common
 
-SHARED_FLAGS	=
 OBJS_NO_TINY	= names.o parallel.o modem.o
 
 .PHONY:	fullstatic static shared tiny doc diet tinydiet uc tinyuc
@@ -30,22 +29,22 @@
 	@make
 
 tiny:
-	@make EXTRA_FLAGS=-DLIBHD_TINY SHARED_FLAGS= LIBS="$(SLIBS)"
+	@make EXTRA_FLAGS=-DLIBHD_TINY SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 diet:
-	@make CC="diet gcc" EXTRA_FLAGS="-fno-pic -DDIET" SHARED_FLAGS= LIBS="$(SLIBS)"
+	@make CC="diet gcc" EXTRA_FLAGS="-fno-pic -DDIET" SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 tinydiet:
-	@make CC="diet gcc" EXTRA_FLAGS="-fno-pic -DLIBHD_TINY -DDIET" SHARED_FLAGS= LIBS="$(SLIBS)"
+	@make CC="diet gcc" EXTRA_FLAGS="-fno-pic -DLIBHD_TINY -DDIET" SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 uc:
-	@make CC="/opt/i386-linux-uclibc/bin/i386-uclibc-gcc" EXTRA_FLAGS="-fno-pic -DUCLIBC" SHARED_FLAGS= LIBS="$(SLIBS)"
+	@make CC="/opt/i386-linux-uclibc/bin/i386-uclibc-gcc" EXTRA_FLAGS="-fno-pic -DUCLIBC" SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 tinyuc:
-	@make CC="/opt/i386-linux-uclibc/usr/bin/gcc" EXTRA_FLAGS="-fno-pic -DLIBHD_TINY -DUCLIBC" SHARED_FLAGS= LIBS="$(SLIBS)"
+	@make CC="/opt/i386-linux-uclibc/usr/bin/gcc" EXTRA_FLAGS="-fno-pic -DLIBHD_TINY -DUCLIBC" SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 static:
-	make SHARED_FLAGS= LIBS="$(SLIBS)"
+	make SHARED_FLAGS="$(SHARED_FLAGS)" LIBS="$(SLIBS)"
 
 fullstatic: static
 	$(CC) -static hwinfo.o $(LDFLAGS) $(SLIBS) -o hwinfo.static
diff -Naur hwinfo-8.38.orig/Makefile.common hwinfo-8.38.new/Makefile.common
--- hwinfo-8.38.orig/Makefile.common	2004-03-02 11:08:40.000000000 +0100
+++ hwinfo-8.38.new/Makefile.common	2004-06-25 13:29:07.000000000 +0200
@@ -17,8 +17,8 @@
 
 CC	= gcc
 LD	= ld
-CFLAGS	= -Wall -O2 -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
 SHARED_FLAGS	= -fPIC
+CFLAGS	= -Wall -O2 -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
 
 LDFLAGS	= -Lsrc