Mercurial Mercurial > upstream > oracle > userland-gate / 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.
components/libconfuse/patches/test-Makefile.in.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 17 Dec 2013 21:59:26 -0800
changeset 1609 87293f3666a2
parent 425 ddb1d95b4cfc
permissions -rw-r--r--
17599591 The Python tox module needs to be added to Userland (fix build) 17599586 The Python webtest module needs to be added to Userland (fix build)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
425
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     1
 
--- confuse-2.6/tests/Makefile.in	Sat Dec 29 02:56:13 2007
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     2
 
+++ confuse-2.6/tests/Makefile.in.new	Tue Jul 12 10:27:06 2011
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     3
 
@@ -91,10 +91,12 @@
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     4
 
 suite_single_SOURCES = suite_single.c
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     5
 
 suite_single_OBJECTS = suite_single.$(OBJEXT)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     6
 
 suite_single_LDADD = $(LDADD)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     7
 
+suite_single_LIBADD = $(LIBADD)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     8
 
 suite_single_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     9
 
 suite_validate_SOURCES = suite_validate.c
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    10
 
 suite_validate_OBJECTS = suite_validate.$(OBJEXT)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    11
 
 suite_validate_LDADD = $(LDADD)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    12
 
+suite_validate_LIBADD = $(LIBADD)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    13
 
 suite_validate_DEPENDENCIES = ../src/libconfuse.la \
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    14
 
 	$(am__DEPENDENCIES_1)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    15
 
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    16
 
@@ -242,6 +244,7 @@
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    17
 
 	single_title_sections quote_before_print
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    18
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    19
 
 LDADD = -L../src ../src/libconfuse.la $(LTLIBINTL)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    20
 
+LIBADD = -lsocket -lnsl
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    21
 
 EXTRA_DIST = a.conf b.conf check_confuse.h
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    22
 
 CLEANFILES = *~
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    23
 
 @cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    24
 
@@ -308,10 +311,10 @@
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    25
 
 	$(LINK) $(suite_list_LDFLAGS) $(suite_list_OBJECTS) $(suite_list_LDADD) $(LIBS)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    26
 
 suite_single$(EXEEXT): $(suite_single_OBJECTS) $(suite_single_DEPENDENCIES)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    27
 
 	@rm -f suite_single$(EXEEXT)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    28
 
-	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LDADD) $(LIBS)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    29
 
+	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LIBADD) $(suite_single_LDADD) $(LIBS)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    30
 
 suite_validate$(EXEEXT): $(suite_validate_OBJECTS) $(suite_validate_DEPENDENCIES)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    31
 
 	@rm -f suite_validate$(EXEEXT)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    32
 
-	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LDADD) $(LIBS)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    33
 
+	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LIBADD) $(suite_validate_LDADD) $(LIBS)
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    34
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    35
 
 mostlyclean-compile:
ddb1d95b4cfc 7067338 migrate libconfuse to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    36
 
 	-rm -f *.$(OBJEXT)
upstream/oracle/userland-gate