diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-28 16:11:12 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-28 16:11:12 -0500 |
commit | 7db02ff4fd90c4942b5ca43ea4c90f143f42e563 (patch) | |
tree | 8c8d6532a281198ae493b1033ec1389abfc18133 /servers/gpib_server_lin/src | |
parent | 6d82d5c33579ec6cf8d606d6da94c29905420cb1 (diff) | |
download | ulab-7db02ff4fd90c4942b5ca43ea4c90f143f42e563.tar.gz ulab-7db02ff4fd90c4942b5ca43ea4c90f143f42e563.zip |
Fix main server automake files
Diffstat (limited to 'servers/gpib_server_lin/src')
-rwxr-xr-x | servers/gpib_server_lin/src/Makefile.am | 6 | ||||
-rw-r--r-- | servers/gpib_server_lin/src/Makefile.in | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/servers/gpib_server_lin/src/Makefile.am b/servers/gpib_server_lin/src/Makefile.am index 0442078..05d3a8e 100755 --- a/servers/gpib_server_lin/src/Makefile.am +++ b/servers/gpib_server_lin/src/Makefile.am @@ -1,11 +1,11 @@ -bin_PROGRAMS = main_server_lin -main_server_lin_SOURCES = gpib_functions.c main_server_lin.c scope_functions.c \ +bin_PROGRAMS = gpib_server_lin +gpib_server_lin_SOURCES = gpib_functions.c main_server_lin.c scope_functions.c \ signal_functions.c commanalyzer_functions.c # set the include path found by configure INCLUDES= $(all_includes) $(GTK_CFLAGS) $(allegro_CFLAGS) # the library search path. -main_server_lin_LDFLAGS = $(all_libraries) $(GTK_LIBS) $(allegro_LIBS) -lgpib +gpib_server_lin_LDFLAGS = $(all_libraries) $(GTK_LIBS) $(allegro_LIBS) -lgpib noinst_HEADERS = gpib_functions.h parameters.h scope_functions.h \ signal_functions.h commanalyzer_functions.h diff --git a/servers/gpib_server_lin/src/Makefile.in b/servers/gpib_server_lin/src/Makefile.in index 8a56830..a9deb42 100644 --- a/servers/gpib_server_lin/src/Makefile.in +++ b/servers/gpib_server_lin/src/Makefile.in @@ -35,7 +35,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = main_server_lin$(EXEEXT) +bin_PROGRAMS = gpib_server_lin$(EXEEXT) subdir = src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -49,14 +49,14 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_main_server_lin_OBJECTS = gpib_functions.$(OBJEXT) \ +am_gpib_server_lin_OBJECTS = gpib_functions.$(OBJEXT) \ main_server_lin.$(OBJEXT) scope_functions.$(OBJEXT) \ signal_functions.$(OBJEXT) commanalyzer_functions.$(OBJEXT) -main_server_lin_OBJECTS = $(am_main_server_lin_OBJECTS) -main_server_lin_LDADD = $(LDADD) -main_server_lin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +gpib_server_lin_OBJECTS = $(am_gpib_server_lin_OBJECTS) +gpib_server_lin_LDADD = $(LDADD) +gpib_server_lin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(main_server_lin_LDFLAGS) $(LDFLAGS) -o $@ + $(gpib_server_lin_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -70,8 +70,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(main_server_lin_SOURCES) -DIST_SOURCES = $(main_server_lin_SOURCES) +SOURCES = $(gpib_server_lin_SOURCES) +DIST_SOURCES = $(gpib_server_lin_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -193,7 +193,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -main_server_lin_SOURCES = gpib_functions.c main_server_lin.c scope_functions.c \ +gpib_server_lin_SOURCES = gpib_functions.c main_server_lin.c scope_functions.c \ signal_functions.c commanalyzer_functions.c @@ -201,7 +201,7 @@ main_server_lin_SOURCES = gpib_functions.c main_server_lin.c scope_functions.c \ INCLUDES = $(all_includes) $(GTK_CFLAGS) $(allegro_CFLAGS) # the library search path. -main_server_lin_LDFLAGS = $(all_libraries) $(GTK_LIBS) $(allegro_LIBS) -lgpib +gpib_server_lin_LDFLAGS = $(all_libraries) $(GTK_LIBS) $(allegro_LIBS) -lgpib noinst_HEADERS = gpib_functions.h parameters.h scope_functions.h \ signal_functions.h commanalyzer_functions.h @@ -282,9 +282,9 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -main_server_lin$(EXEEXT): $(main_server_lin_OBJECTS) $(main_server_lin_DEPENDENCIES) - @rm -f main_server_lin$(EXEEXT) - $(main_server_lin_LINK) $(main_server_lin_OBJECTS) $(main_server_lin_LDADD) $(LIBS) +gpib_server_lin$(EXEEXT): $(gpib_server_lin_OBJECTS) $(gpib_server_lin_DEPENDENCIES) + @rm -f gpib_server_lin$(EXEEXT) + $(gpib_server_lin_LINK) $(gpib_server_lin_OBJECTS) $(gpib_server_lin_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |