Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/newt-02-solaris-makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1218 5a8414397010
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1218
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     1
 
--- Makefile.in.orig	Fri Jun 20 17:21:47 2008
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     2
 
+++ Makefile.in	Fri Jun 20 17:26:02 2008
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     3
 
@@ -3,14 +3,13 @@
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     4
 
 LIBTCL = -ltcl8.4
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     5
1073
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
     6
 
 GPM_SUPPORT=@gpm_support@
1218
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     7
 
-CFLAGS = $(RPM_OPT_FLAGS) -Wall  -D_GNU_SOURCE -g -O2 -DUTF8 -fPIC -I/usr/include/slang
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
     8
 
+CFLAGS = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g -O2 -DUTF8 -fPIC -I/usr/include/slang
1073
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
     9
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    10
 
-SHLIBFLAGS= -Wl,-O1 -Wl,--version-script,newt.0.52.ver
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    11
 
 VERSION = @VERSION@
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    12
 
 CVSTAG = r$(subst .,-,$(VERSION))
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    13
 
 SONAME = @SONAME@
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    14
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    15
 
-PYTHONVERS = $(shell pyversions --supported)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    16
 
+PYTHONVERS = python2.4
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    17
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    18
 
 WHIPTCLSO=whiptcl.so
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    19
1218
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    20
 
@@ -40,11 +39,11 @@
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    21
 
 SHAREDDIR = shared
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    22
 
 SHAREDOBJS = $(patsubst %,$(SHAREDDIR)/%, $(LIBOBJS))
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    23
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    24
 
-ifeq (.depend,$(wildcard .depend))
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    25
 
+#ifeq (.depend,$(wildcard .depend))
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    26
 
 TARGET=$(PROGS)
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    27
 
-else
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    28
 
-TARGET=depend $(PROGS)
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    29
 
-endif
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    30
 
+#else
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    31
 
+#TARGET=depend $(PROGS)
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    32
 
+#endif
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    33
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    34
 
 all:	$(TARGET) _snackmodule.so po/stamp-po
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    35
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    36
 
@@ -52,7 +51,7 @@
1073
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    37
 
 	$(MAKE) -C po stamp-po
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    38
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    39
 
 test:	$(TESTOBJS) $(LIBNEWT)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    40
 
-	$(CC) -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    41
 
+	$(CC) -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    42
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    43
 
 testgrid:	testgrid.o $(LIBNEWT)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    44
 
 	$(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
1218
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    45
 
@@ -68,18 +67,16 @@
1073
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    46
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    47
 
 _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    48
 
 	for ver in $(PYTHONVERS) ; do \
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    49
 
-	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    50
 
-	    	mkdir -p $$ver ;\
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    51
 
-	        $(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    52
 
+	    mkdir -p $$ver ;\
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    53
 
+	    $(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    54
 
 		$(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt  ;\
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    55
 
-	    fi ; \
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    56
 
 	done
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    57
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    58
 
 whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    59
 
-	$(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt -lpopt
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    60
 
+	$(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt -lpopt -lslang
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    61
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    62
 
 whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    63
 
-	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    64
 
+	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt -lslang
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    65
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    66
 
 # Ensure dialogboxes is compiled -fPIC
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    67
 
 dialogboxes.o: dialogboxes.c
1218
5a8414397010 2008-06-20 River Tarnell <[email protected]>
rtarnell
parents: 1073
diff changeset 
    68
 
@@ -111,7 +108,7 @@
1073
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    69
 
 sharedlib: $(LIBNEWTSH)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    70
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    71
 
 $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    72
 
-	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    73
 
+	$(CC) -shared -o $(LIBNEWTSH) $(SHAREDOBJS) $(SHLIBS)
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    74
 
 	ln -fs $(LIBNEWTSH) libnewt.so
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    75
563acf208975 2008-05-01 Ananth Shrinivas <[email protected]>
ananthshrinivas
parents:
diff changeset 
    76
 
 $(SHAREDDIR)/%.o : %.c
upstream/spec-files-extra