diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:37:41 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-08-27 10:37:41 +0200 |
| commit | d211b19e12f0a6b124f4921fe12ca707c7a5e709 (patch) | |
| tree | fc4a3e172af7887e948ec5ebc1d5e20d9f167b76 | |
| parent | b2c551c1e6465a18cba9ab5ffc2ed4facb9b2458 (diff) | |
| download | samba-d211b19e12f0a6b124f4921fe12ca707c7a5e709.tar.gz | |
Revert "build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency."
This reverts commit eb892f90c9be0ebc2217fc459d4249190986c003.
| -rw-r--r-- | source/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 2a8bec061f3..11f7085d0f3 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1798,7 +1798,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@ # #------------------------------------------------------------------- -LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ +LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/cm.o \ librpc/gen_ndr/ndr_libnetapi.o \ lib/netapi/libnetapi.o \ @@ -1807,7 +1807,7 @@ LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ lib/netapi/getdc.o \ lib/netapi/user.o -LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \ +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ $(LIBSMBCONF_OBJ) \ $(REG_SMBCONF_OBJ) \ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1838,9 +1838,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ -$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ0) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) libnetapi: $(LIBNETAPI) |