Changeset 534 for trunk/src/Makefile.in

Timestamp:

11/29/09 22:37:56 (2 years ago)

Author:

eagle

Message:

merged GarliCat branch back into trunk
onioncat-privatehosts.pl added (code by zzz)

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.in (modified) (6 diffs)

trunk/src/Makefile.in

@@ -58 +58 @@
         ocatipv4route.$(OBJEXT) ocateth.$(OBJEXT) ocatsocks.$(OBJEXT) \
         ocatlibe.$(OBJEXT) ocatctrl.$(OBJEXT) ocatipv6route.$(OBJEXT) \
-        ocaticmp.$(OBJEXT) ocat_wintuntap.$(OBJEXT)
+        ocaticmp.$(OBJEXT) ocat_wintuntap.$(OBJEXT) \
+        ocat_netdesc.$(OBJEXT)
 ocat_OBJECTS = $(am_ocat_OBJECTS)
 ocat_LDADD = $(LDADD)
@@ -107 +108 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -168 +170 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c
-include_HEADERS = ocat.h strlcpy.c strlcat.c
+ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c
+include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
 all: all-am
 
@@ -237 +239 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat_netdesc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocat_wintuntap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ocatcompat.Po@am__quote@
@@ -415 +418 @@
 
 install-exec-am: install-binPROGRAMS
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
@@ -447 +452 @@
         html-am info info-am install install-am install-binPROGRAMS \
         install-data install-data-am install-exec install-exec-am \
-        install-includeHEADERS install-info install-info-am \
-        install-man install-strip installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-        ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
-        uninstall-includeHEADERS uninstall-info-am
-
+        install-exec-hook install-includeHEADERS install-info \
+        install-info-am install-man install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+        uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
+        uninstall-info-am
+
+
+install-exec-hook:
+        $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \
+        $(DESTDIR)$(bindir)/gcat$(EXEEXT)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.